From: Joerg Roedel Date: Wed, 23 Jul 2014 14:04:37 +0000 (+0200) Subject: Merge branch 'core' into x86/vt-d X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~6186^2~16 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=cbb24a25a871cbdac4e58b68b541aadd91b249be;p=linux-4.9.git Merge branch 'core' into x86/vt-d Conflicts: drivers/iommu/intel-iommu.c --- cbb24a25a871cbdac4e58b68b541aadd91b249be